Handle the no-target case through user information. #408
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jmirabel
approved these changes
Jun 18, 2020
olivier-stasse
force-pushed
the
topic/no-target-v4
branch
from
edf0313 to
ec4a43a
Compare
|
Nice simplification. I just tested it, it worked as proposed. |
|
I let @gergondet merge if it is ok for him now. |
|
This looks fine, but:
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
endif() |
I thought about that too. I preferred the explicit method so that, at configure time, you explicitly say whether or not there is a targets file, rather than looking for it later. This avoids the annoying issue of a file existing but not found. If there is one but you did not find it, it is better to report an error. |
olivier-stasse
force-pushed
the
topic/no-target-v4
branch
from
ec4a43a to
e17035f
Compare
|
Last commit is correcting point 1, 2 and 3. |
gergondet
reviewed
Jun 19, 2020
package-config.cmake
Outdated
| @@ -154,6 +154,13 @@ if(_PKG_CONFIG_REQUIRES) | |||
| endforeach() | |||
| list(REMOVE_DUPLICATES _PKG_CONFIG_REQUIRES_LIST) | |||
| endif(_PKG_CONFIG_REQUIRES) | |||
|
|
|||
| if(NOT PROJECT_EXPORT_NO_TARGET) | |||
| SET(INCLUDE_TARGETS_FILE "include(\"\${CMAKE_CURRENT_LIST_DIR}/${TARGETS_EXPORT_NAME}.cmake\")") | |||
|
I agree on point 4 as well. So just two more small changes and it's good too go :) |
Lean implementation. Uses variable PROJECT_EXPORT_NO_TARGET Documentation for the variable. From SET to set
olivier-stasse
force-pushed
the
topic/no-target-v4
branch
from
e17035f to
275ad54
Compare
|
SET -> set done |
jcarpent
pushed a commit
to jcarpent/jrl-cmakemodules
that referenced
this pull request
Jun 23, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Goal
Handling package with no targets (typically data packages)
Issue #398
Remplacement of PR #403
Principle
The user specifies the property/variable ZERO_TARGET of the target PROJECT_NAME to true:
Then the export of exportTarget.cmake is not generated (currently generating a bug),
and then an expression is set on Config.cmake.in avoiding the inclusion of this file.
This is necessary to avoid later error when upstream packages are using the cmake recipe of this package.
When a normal package is used the expression is true and thus the inclusion of the target is done.
Tested in both situations.